Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #4812] Set up Admin Endpoints v2 #4813

Merged
merged 18 commits into from
Apr 8, 2024

Conversation

Pil0tXia
Copy link
Member

@Pil0tXia Pil0tXia commented Apr 5, 2024

Fixes #4812

Motivation

Organize and optimize the code merged in #4768, and implement v2 endpoints used for the new EventMesh Dashboard.

Modifications

  • Added PUT method to org.apache.eventmesh.runtime.admin.handler.AbstractHttpHandler#handle
  • Eliminated the step of getBytes in org.apache.eventmesh.runtime.admin.handler.AbstractHttpHandler#write
  • No need to construct HttpResponse with cross-origin headers in endpoint implementation code
  • Cleaned up various overloaded methods that were messy and non-hierarchical
  • For old endpoints, the path remains unchanged temporarily (endpoint path needs modification by Next.js Dashboard), suffix class names with V1, moved to v1 package; for new endpoints, use path /v2, do not suffix class names with V2, placed in v2 package.
  • Corrected incorrect naming of annotations such as @ConfigField
  • Implemented /v2/configuration endpoint, returning all Runtime configurations.

For detailed changes, refer to the naming of each commit.

Screenshots

image

image

image

Documentation

  • Does this pull request introduce a new feature? (yes)
  • If yes, how is the feature documented? (JavaDocs)
  • If a feature is not applicable for documentation, explain why?
  • If a feature is not documented yet in this PR, please create a followup issue for adding the documentation

@codecov-commenter
Copy link

codecov-commenter commented Apr 5, 2024

Codecov Report

Attention: Patch coverage is 38.96458% with 224 lines in your changes are missing coverage. Please review.

Project coverage is 16.22%. Comparing base (98b1ed1) to head (be29dda).
Report is 4 commits behind head on master.

❗ Current head be29dda differs from pull request most recent head 1930bbe. Consider uploading reports for the commit 1930bbe to get more accurate results

Files Patch % Lines
...runtime/admin/handler/v2/ConfigurationHandler.java 0.00% 47 Missing ⚠️
...esh/runtime/admin/handler/AbstractHttpHandler.java 0.00% 24 Missing ⚠️
...apache/eventmesh/runtime/util/HttpRequestUtil.java 0.00% 15 Missing ⚠️
...ache/eventmesh/runtime/util/HttpResponseUtils.java 0.00% 9 Missing ⚠️
...pache/eventmesh/runtime/admin/response/Result.java 0.00% 8 Missing ⚠️
...esh/runtime/admin/handler/AdminHandlerManager.java 0.00% 7 Missing ⚠️
...mmon/config/convert/converter/ObjectConverter.java 53.84% 1 Missing and 5 partials ⚠️
...me/admin/response/v2/GetConfigurationResponse.java 0.00% 6 Missing ⚠️
...entmesh/runtime/admin/handler/v1/EventHandler.java 0.00% 5 Missing ⚠️
...n/handler/v1/RedirectClientBySubSystemHandler.java 0.00% 5 Missing ⚠️
... and 46 more
Additional details and impacted files
@@             Coverage Diff              @@
##             master    #4813      +/-   ##
============================================
+ Coverage     16.20%   16.22%   +0.01%     
- Complexity     1710     1712       +2     
============================================
  Files           857      858       +1     
  Lines         30883    30885       +2     
  Branches       2685     2693       +8     
============================================
+ Hits           5005     5010       +5     
+ Misses        25410    25409       -1     
+ Partials        468      466       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@karsonto
Copy link
Contributor

karsonto commented Apr 8, 2024

LGTM

@mxsm mxsm merged commit c2af2d4 into apache:master Apr 8, 2024
9 checks passed
@Pil0tXia Pil0tXia deleted the pil0txia/feat_4812 branch April 8, 2024 14:15
xwm1992 added a commit that referenced this pull request Apr 22, 2024
* [ISSUE #4812] Set up Admin Endpoints v2 (#4813)

* Remove redundant overloaded methods

* Simplify write() result param

* Add writeJson(); Add PUT; Add JavaDoc

* Rename EventHttpHandler to EventMeshHttpHandler

* Correct server thread name

* Clean up messy & non-hierarchical overloading

* No need to set headers manually any more

* Set up v1&v2 endpoints

* Set up v1&v2 response dto

* Introduce fastjson2

* Fix fastjson2 "level too large : 2048" error caused by IPAddress

* Correct @ConfigField naming

* Return properties format json key

* Add format option to query string

* Introduce Result

* Reduce duplicate builder code

* Fix all checkstyle warnings in eventmesh-runtime

* Add known dependency

* [ISSUE #4814] Migrate from fastjson 1.2.83 to fastjson2 (#4819)

* [Enhancement] Migrate from fastjson 1.2.83 to fastjson2 #4814

* fix_dependencies_problem

* fix_check

* [ISSUE #4551] modify the logic of time-consumption statistics (#4822)

* init connector runtime v2

* [ISSUE #4804] Fix SubStreamHandler exception loop by closeOnError (#4807)

* Handle exception loop by closeOnError

* Lombok optimization

* some format optimization

* Avoid closing multiple times

* Remove redundant set null

* Revert "Avoid closing multiple times"

This reverts commit 774397f.

* Use synchronized latch to keep senderOnComplete called once

* Use boolean to prevent latch called by somebody else

* Remove the unique callee/caller close() of onCompleted()

* [ISSUE #4838] Deprecate unused `eventMesh.connector.plugin.type` etc. properties (#4839)

* Remove all references of `eventMesh.connector.plugin.type`

* Deprecate `eventMesh.connector.plugin.type` and sort properties

* Remove misconfigured & not-used `registerIntervalInMills`, `fetchRegistryAddrIntervalInMills`

* Remove 'defibus' related un-used usages

* Supplement #4809 for `null != object`

* [ISSUE #4832] Downgrade stale bot to v8 to resolve state cache reserving error (#4833)

* Revert stale bot to v8 to resolve state cache reserving error

* Reduce operations-per-run to default value to ease pressure

* Unify yaml to yml

* [ISSUE #4820] Bug fix EventHandler not return json (#4821)

* bug fix

* bug fix

* bug fix

* update runtime v2

* update connector runtime

* update connector runtime

* update connector runtime

* update connector runtime

* update connector runtime

---------

Co-authored-by: Pil0tXia <xiatian@apache.org>
Co-authored-by: Zaki <91261012+cnzakii@users.noreply.github.com>
Co-authored-by: Karson <karsontao@hotmail.com>
xwm1992 added a commit that referenced this pull request May 31, 2024
* EventMesh function admin (#4851)

* own

* dependency

* finish registry

* EventMesh function admin (#4853)

* own

* dependency

* finish registry

* init

* Eventmesh function admin (#4854)

* own

* dependency

* finish registry

* init

* 0419

* 0419

* more discovery and move gRPC

* fix dependency

* EventMesh function connector runtime (#4858)

* [ISSUE #4812] Set up Admin Endpoints v2 (#4813)

* Remove redundant overloaded methods

* Simplify write() result param

* Add writeJson(); Add PUT; Add JavaDoc

* Rename EventHttpHandler to EventMeshHttpHandler

* Correct server thread name

* Clean up messy & non-hierarchical overloading

* No need to set headers manually any more

* Set up v1&v2 endpoints

* Set up v1&v2 response dto

* Introduce fastjson2

* Fix fastjson2 "level too large : 2048" error caused by IPAddress

* Correct @ConfigField naming

* Return properties format json key

* Add format option to query string

* Introduce Result

* Reduce duplicate builder code

* Fix all checkstyle warnings in eventmesh-runtime

* Add known dependency

* [ISSUE #4814] Migrate from fastjson 1.2.83 to fastjson2 (#4819)

* [Enhancement] Migrate from fastjson 1.2.83 to fastjson2 #4814

* fix_dependencies_problem

* fix_check

* [ISSUE #4551] modify the logic of time-consumption statistics (#4822)

* init connector runtime v2

* [ISSUE #4804] Fix SubStreamHandler exception loop by closeOnError (#4807)

* Handle exception loop by closeOnError

* Lombok optimization

* some format optimization

* Avoid closing multiple times

* Remove redundant set null

* Revert "Avoid closing multiple times"

This reverts commit 774397f.

* Use synchronized latch to keep senderOnComplete called once

* Use boolean to prevent latch called by somebody else

* Remove the unique callee/caller close() of onCompleted()

* [ISSUE #4838] Deprecate unused `eventMesh.connector.plugin.type` etc. properties (#4839)

* Remove all references of `eventMesh.connector.plugin.type`

* Deprecate `eventMesh.connector.plugin.type` and sort properties

* Remove misconfigured & not-used `registerIntervalInMills`, `fetchRegistryAddrIntervalInMills`

* Remove 'defibus' related un-used usages

* Supplement #4809 for `null != object`

* [ISSUE #4832] Downgrade stale bot to v8 to resolve state cache reserving error (#4833)

* Revert stale bot to v8 to resolve state cache reserving error

* Reduce operations-per-run to default value to ease pressure

* Unify yaml to yml

* [ISSUE #4820] Bug fix EventHandler not return json (#4821)

* bug fix

* bug fix

* bug fix

* update runtime v2

* update connector runtime

* update connector runtime

* update connector runtime

* update connector runtime

* update connector runtime

---------

Co-authored-by: Pil0tXia <xiatian@apache.org>
Co-authored-by: Zaki <91261012+cnzakii@users.noreply.github.com>
Co-authored-by: Karson <karsontao@hotmail.com>

* [ISSUE #4931]Add Registry Module for Discovery AdminServer

* [ISSUES #4933]Add Admin Module

* [ISSUE #4935] Add and Move the Pojo Used By Both Runtime and Admin to Common

* [ISSUE #4937]fix gradle dependecy and add runtime v2

* [ISSUES #4939]add canal connector

* fix missing apache header

* fix missing apache header

* fix missing apache header

* update gradle dependencies

* fix admin server ci check error

* fix admin server ci check error

* fix ci checkStyle error

* fix ci check error

---------

Co-authored-by: sodaRyCN <35725024+sodaRyCN@users.noreply.github.com>
Co-authored-by: Pil0tXia <xiatian@apache.org>
Co-authored-by: Zaki <91261012+cnzakii@users.noreply.github.com>
Co-authored-by: Karson <karsontao@hotmail.com>
xwm1992 added a commit that referenced this pull request Jul 2, 2024
* EventMesh function admin (#4851)

* own

* dependency

* finish registry

* EventMesh function admin (#4853)

* own

* dependency

* finish registry

* init

* Eventmesh function admin (#4854)

* own

* dependency

* finish registry

* init

* 0419

* 0419

* more discovery and move gRPC

* fix dependency

* EventMesh function connector runtime (#4858)

* [ISSUE #4812] Set up Admin Endpoints v2 (#4813)

* Remove redundant overloaded methods

* Simplify write() result param

* Add writeJson(); Add PUT; Add JavaDoc

* Rename EventHttpHandler to EventMeshHttpHandler

* Correct server thread name

* Clean up messy & non-hierarchical overloading

* No need to set headers manually any more

* Set up v1&v2 endpoints

* Set up v1&v2 response dto

* Introduce fastjson2

* Fix fastjson2 "level too large : 2048" error caused by IPAddress

* Correct @ConfigField naming

* Return properties format json key

* Add format option to query string

* Introduce Result

* Reduce duplicate builder code

* Fix all checkstyle warnings in eventmesh-runtime

* Add known dependency

* [ISSUE #4814] Migrate from fastjson 1.2.83 to fastjson2 (#4819)

* [Enhancement] Migrate from fastjson 1.2.83 to fastjson2 #4814

* fix_dependencies_problem

* fix_check

* [ISSUE #4551] modify the logic of time-consumption statistics (#4822)

* init connector runtime v2

* [ISSUE #4804] Fix SubStreamHandler exception loop by closeOnError (#4807)

* Handle exception loop by closeOnError

* Lombok optimization

* some format optimization

* Avoid closing multiple times

* Remove redundant set null

* Revert "Avoid closing multiple times"

This reverts commit 774397f.

* Use synchronized latch to keep senderOnComplete called once

* Use boolean to prevent latch called by somebody else

* Remove the unique callee/caller close() of onCompleted()

* [ISSUE #4838] Deprecate unused `eventMesh.connector.plugin.type` etc. properties (#4839)

* Remove all references of `eventMesh.connector.plugin.type`

* Deprecate `eventMesh.connector.plugin.type` and sort properties

* Remove misconfigured & not-used `registerIntervalInMills`, `fetchRegistryAddrIntervalInMills`

* Remove 'defibus' related un-used usages

* Supplement #4809 for `null != object`

* [ISSUE #4832] Downgrade stale bot to v8 to resolve state cache reserving error (#4833)

* Revert stale bot to v8 to resolve state cache reserving error

* Reduce operations-per-run to default value to ease pressure

* Unify yaml to yml

* [ISSUE #4820] Bug fix EventHandler not return json (#4821)

* bug fix

* bug fix

* bug fix

* update runtime v2

* update connector runtime

* update connector runtime

* update connector runtime

* update connector runtime

* update connector runtime

---------

Co-authored-by: Pil0tXia <xiatian@apache.org>
Co-authored-by: Zaki <91261012+cnzakii@users.noreply.github.com>
Co-authored-by: Karson <karsontao@hotmail.com>

* [ISSUE #4931]Add Registry Module for Discovery AdminServer

* [ISSUES #4933]Add Admin Module

* [ISSUE #4935] Add and Move the Pojo Used By Both Runtime and Admin to Common

* [ISSUE #4937]fix gradle dependecy and add runtime v2

* [ISSUES #4939]add canal connector

* fix missing apache header

* fix missing apache header

* fix missing apache header

* update gradle dependencies

* fix admin server ci check error

* fix admin server ci check error

* fix ci checkStyle error

* fix ci check error

* [ISSUE #4979]Canal Connector supports bidirectional data synchronization

* add bash files for admin & runtime-v2

* fix ack offset read & persist

* fix checkStyle error

* [ISSUE #4979] Canal Connector supports bidirectional data synchronization (#5011)

* [ISSUE #4979]Canal Connector supports bidirectional data synchronization

* add bash files for admin & runtime-v2

* fix ack offset read & persist

* fix checkStyle error

* fix http source connector test error

---------

Co-authored-by: sodaRyCN <35725024+sodaRyCN@users.noreply.github.com>
Co-authored-by: Pil0tXia <xiatian@apache.org>
Co-authored-by: Zaki <91261012+cnzakii@users.noreply.github.com>
Co-authored-by: Karson <karsontao@hotmail.com>
@xwm1992 xwm1992 added this to the 1.11.0 milestone Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature] Set up Admin Endpoints v2
6 participants